Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Dec 2011 07:27:27 +0000 (23:27 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Dec 2011 07:27:27 +0000 (23:27 -0800)
commit80afc7ea9708d6c7ac912a3cb3a87586c548a40b
tree10da4929f5115d1367128aa50da61a06346f7283
parent1cd6fcb42fc65be6a3776e90a1e3bd66558c9a46
parentd87fc5c80377f16c24430a55fa6e38153ffbf327
Merge from trunk.